From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 29 Apr 2024 19:36:22 +0000 (+0200)
Subject: do-not-abort-on-NON_APPLICATION_FONT_USE
X-Git-Tag: archive/raspbian/4%24.2.5-1+rpi1~2^2^2^2^2~7
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22%22?a=commitdiff_plain;h=4af278747fcd23c2b7e32ce542463533a737e454;p=libreoffice.git

do-not-abort-on-NON_APPLICATION_FONT_USE


Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff
---

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 196e418d8ba..cfdf4a10aa5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -143,9 +143,6 @@ else
 		$(if $(gb_CppunitTest__vcl_no_svp), \
 			$(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
 		$(EXTRA_ENV_VARS) \
-		$(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
-			$(if $(filter abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
-			$(if $(filter deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
 		$(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \